Emit QueryCountMetrics for SQL Queries #17452
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
Area - Batch Ingestion
Area - Querying
Area - MSQ
jtuglu-netflix
changed the title
jtuglu-netflix
force-pushed
the
add-query-metrics-for-sql-base-query-class-member
branch
from
56d95c5
to
bd5679f
Compare
This also fixes a bug in the QueryResultPusher code regarding handling of exceptions.
jtuglu-netflix
force-pushed
the
add-query-metrics-for-sql-base-query-class-member
branch
from
219de13
to
03d0fd3
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #11652.
Description
This pulls out the query count metrics logic from
QueryResourceand places it intoBaseQueryCounterResource, which allows forSqlResourceto share this codepath. An alternative approach is here, which avoids shared logic between the two resources. As stated in the issue, the ideal change would be to haveSqlResourceinherit, or simply pass on, all query handling toQueryResource, but that seemed a bit out of scope for this PR (but I can do this).Notes:
QueryResourceandSqlResourcefor simplicity, and simply made the counter package-private for accessing in tests. I can add theget()accessors back if necessary.Release note
Key changed/added classes in this PR
extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/http/DartSqlResource.javaextensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/dart/controller/http/DartSqlResourceTest.javaquidem-ut/src/main/java/org/apache/druid/quidem/ExposedAsBrokerQueryComponentSupplierWrapper.javaserver/src/main/java/org/apache/druid/server/BaseQueryCountResource.javaserver/src/main/java/org/apache/druid/server/BrokerQueryResource.javaserver/src/main/java/org/apache/druid/server/QueryMetricCounter.javaserver/src/main/java/org/apache/druid/server/QueryResource.javaserver/src/main/java/org/apache/druid/server/QueryResultPusher.javaserver/src/test/java/org/apache/druid/server/QueryResourceTest.javaserver/src/test/java/org/apache/druid/server/QueryResultPusherTest.javaservices/src/main/java/org/apache/druid/cli/CliBroker.javaservices/src/main/java/org/apache/druid/cli/CliHistorical.javaservices/src/main/java/org/apache/druid/guice/QueryablePeonModule.javasql/src/main/java/org/apache/druid/sql/http/SqlResource.javasql/src/test/java/org/apache/druid/sql/http/SqlResourceTest.javaThis PR has: